Build divviup_api_integration_test with admin
#1100
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We want the `divviup` CLI packaged into the `divviup_api_integration_test` container to be built with feature `admin` for reasons discussed in #1099. In this commit: - add feature `admin` to builds of `divviup_api_integration_test` in `docker-release.yaml` so that the bundled CLI will have `--first-party` and `--shared` - adds a service `pair_aggregator` to `compose.dev.override.yaml` that uses the `/divviup` entrypoint to pair `janus_1_aggregator` as a first-party, shared aggregator - factors the `build` stanza out of services in `compose.dev.override.yaml` to apply features to them uniformly - tunes the health checks on `divviup-api` and the aggregators so they will succeed sooner and speed up startup Part of #1096
divergentdave
approved these changes
Jun 14, 2024
branlwyd
approved these changes
Jun 14, 2024
tgeoghegan
added a commit
that referenced
this pull request
Jun 14, 2024
In #1100, we started building `divviup_api_integration_test` with feature `admin`. This breaks `docker-release.yml`, because the Rust features are used to construct GH Actions cache keys, and commas are illegal there (at the very least, `docker buildx build --cache-from` doesn't like it). Construct the cache key by joining with `-` to work `around this. Additionally, this _should_ have broken `docker.yml`, but I forgot to add the `admin` feature there, which this PR corrects. Part of #1096
tgeoghegan
added a commit
that referenced
this pull request
Jun 14, 2024
In #1100, we started building `divviup_api_integration_test` with feature `admin`. This breaks `docker-release.yml`, because the Rust features are used to construct GH Actions cache keys, and commas are illegal there (at the very least, `docker buildx build --cache-from` doesn't like it). Construct the cache key by joining with `-` to work `around this. Additionally, this _should_ have broken `docker.yml`, but I forgot to add the `admin` feature there, which this PR corrects. Part of #1096
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We want the
divviupCLI packaged into thedivviup_api_integration_testcontainer to be built with featureadminfor reasons discussed in #1099. In this commit:adminto builds ofdivviup_api_integration_testindocker-release.yamlso that the bundled CLI will have--first-partyand--sharedpair_aggregatortocompose.dev.override.yamlthat uses the/divviupentrypoint to pairjanus_1_aggregatoras a first-party, shared aggregatorbuildstanza out of services incompose.dev.override.yamlto apply features to them uniformlydivviup-apiand the aggregators so they will succeed sooner and speed up startupPart of #1096